From 74f2ddfbfacedcc95bd60d366896c753c576e1fc Mon Sep 17 00:00:00 2001 From: Daniel Sabo Date: Thu, 10 Oct 2013 05:30:58 -0700 Subject: [PATCH] Remove broken introspection bindings They primarily existed to support GEGL, and there are more solid wrappers around the related functions in GEGL now. --- Makefile.am | 2 - babl/Babl-0.1.gir.static | 457 --------------------------------------- babl/Makefile.am | 56 ----- configure.ac | 28 --- m4/introspection.m4 | 94 -------- tests/Makefile.am | 11 +- tests/introspection.py | 18 -- 7 files changed, 1 insertion(+), 665 deletions(-) delete mode 100644 babl/Babl-0.1.gir.static delete mode 100644 m4/introspection.m4 delete mode 100755 tests/introspection.py diff --git a/Makefile.am b/Makefile.am index 7008414..d2a4f2b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,4 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} -#DISTCHECK_CONFIGURE_FLAGS = --enable-introspection SUBDIRS = \ babl \ @@ -23,7 +22,6 @@ EXTRA_DIST = \ NEWS \ TODO \ autogen.sh \ - m4/introspection.m4 \ babl.pc.in DISTCLEANFILES = \ diff --git a/babl/Babl-0.1.gir.static b/babl/Babl-0.1.gir.static deleted file mode 100644 index f6b41dd..0000000 --- a/babl/Babl-0.1.gir.static +++ /dev/null @@ -1,457 +0,0 @@ - - - - - - The babl API is based around polymorphism and almost everything is -a Babl object. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/babl/Makefile.am b/babl/Makefile.am index 976b1e0..5d0c1f1 100644 --- a/babl/Makefile.am +++ b/babl/Makefile.am @@ -87,61 +87,5 @@ libbabl_@BABL_API_VERSION@_la_LDFLAGS= \ ${no_undefined} $(MATH_LIB) \ -version-info $(BABL_LIBRARY_VERSION) -# GObject Introspection --include $(INTROSPECTION_MAKEFILE) -INTROSPECTION_GIRS = -INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) -INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) - -if HAVE_INTROSPECTION - -if HAVE_GI_RENAME_TO -Babl-$(BABL_API_VERSION).gir: $(G_IR_SCANNER) $(library_include_HEADERS) $(c_sources) $(srcdir)/Makefile.am libbabl-@BABL_API_VERSION@.la - $(INTROSPECTION_SCANNER) -v --warn-all \ - --namespace Babl --nsversion=$(BABL_API_VERSION) \ - --add-include-path=$(srcdir) --add-include-path=. \ - --library=$(builddir)/libbabl-$(BABL_API_VERSION).la \ - --libtool="$(LIBTOOL)" \ - --output $@ \ - -DBABL_IS_BEING_COMPILED \ - -I$(top_srcdir) \ - -I$(top_builddir) \ - $(addprefix $(srcdir)/, $(libinc_hdrs)) \ - $(addprefix $(builddir)/, $(libinc_generated_hdrs)) \ - $(addprefix $(srcdir)/, $(c_sources)) - -else # HAVE_GI_RENAME_TO -# If the "rename to" gobject introspection annotation is not respected (GI <= 1.33.4) -# we have to use a pre-generated .gir file. See https://bugzilla.gnome.org/show_bug.cgi?id=673422 -# and https://bugzilla.gnome.org/show_bug.cgi?id=675985 -Babl-$(BABL_API_VERSION).gir: - cp $@.static $@ - -endif # HAVE_GI_RENAME_TO - -girdir = $(datadir)/gir-1.0 -gir_DATA = Babl-$(BABL_API_VERSION).gir - -typelibsdir = $(libdir)/girepository-1.0 -typelibs_DATA = Babl-$(BABL_API_VERSION).typelib - -%.typelib: %.gir - LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}. $(INTROSPECTION_COMPILER) \ - --includedir=$(srcdir) \ - --includedir=$(top_builddir)/babl \ - $(G_IR_COMPILER_OPTS) \ - $< -o $@ - -if HAVE_VALA -babl-$(BABL_API_VERSION).vapi: Babl-$(BABL_API_VERSION).gir - $(VAPIGEN) --library=babl-$(BABL_API_VERSION) Babl-$(BABL_API_VERSION).gir - -vapidir=$(datadir)/vala/vapi -vapi_DATA = babl-$(BABL_API_VERSION).vapi - -endif # HAVE_VALA - -endif # HAVE_INTROSPECTION - EXTRA_DIST = $(gir_DATA) CLEANFILES = $(gir_DATA) $(typelibs_DATA) $(vapi_DATA) diff --git a/configure.ac b/configure.ac index 8d3826a..4fe66b1 100644 --- a/configure.ac +++ b/configure.ac @@ -61,34 +61,6 @@ AC_SUBST(BABL_API_VERSION) BABL_RELEASE=babl_api_version AC_SUBST(BABL_RELEASE) -# GObject Introspection -GOBJECT_INTROSPECTION_CHECK([0.10]) - -# Check whether g-ir-scanner respects "rename to" annotation -PKG_CHECK_MODULES([GI_1_33_5], [gobject-introspection-1.0 >= 1.33.5], - [have_gi_rename_to=true], - [have_gi_rename_to=false] -) -AM_CONDITIONAL(HAVE_GI_RENAME_TO, [test x$have_gi_rename_to = xtrue]) - -# Vala -AC_ARG_WITH(vala, [ --without-vala build without Vala support]) - -have_vapigen="no" -if test "x$with_vala" != "xno"; then - - AC_PATH_PROG(VAPIGEN, vapigen, no) - if test "$VAPIGEN" = "no"; then - have_vapigen="no (vapigen executable not found)" - AC_MSG_RESULT([*** Check for vapigen failed.]) - else - have_vapigen="yes" - fi -fi - -have_vala=$have_vapigen -AM_CONDITIONAL(HAVE_VALA, test "$have_vala" = "yes") - dnl The symbol BABL_UNSTABLE is defined above for substitution in dnl Makefiles and conditionally defined here as a preprocessor symbol dnl and automake conditional. diff --git a/m4/introspection.m4 b/m4/introspection.m4 deleted file mode 100644 index 84e2c61..0000000 --- a/m4/introspection.m4 +++ /dev/null @@ -1,94 +0,0 @@ -dnl -*- mode: autoconf -*- -dnl Copyright 2009 Johan Dahlin -dnl -dnl This file is free software; the author(s) gives unlimited -dnl permission to copy and/or distribute it, with or without -dnl modifications, as long as this notice is preserved. -dnl - -# serial 1 - -m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], -[ - AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first - AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first - AC_BEFORE([LT_INIT],[$0])dnl setup libtool first - - dnl enable/disable introspection - m4_if([$2], [require], - [dnl - enable_introspection=yes - ],[dnl - AC_ARG_ENABLE(introspection, - AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]], - [Enable introspection for this build]),, - [enable_introspection=no]) - ])dnl - - AC_MSG_CHECKING([for gobject-introspection]) - - dnl presence/version checking - AS_CASE([$enable_introspection], - [no], [dnl - found_introspection="no (disabled, use --enable-introspection to enable)" - ],dnl - [yes],[dnl - PKG_CHECK_EXISTS([gobject-introspection-1.0],, - AC_MSG_ERROR([gobject-introspection-1.0 is not installed])) - PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], - found_introspection=yes, - AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME])) - ],dnl - [auto],[dnl - PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no) - ],dnl - [dnl - AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@]) - ])dnl - - AC_MSG_RESULT([$found_introspection]) - - INTROSPECTION_SCANNER= - INTROSPECTION_COMPILER= - INTROSPECTION_GENERATE= - INTROSPECTION_GIRDIR= - INTROSPECTION_TYPELIBDIR= - if test "x$found_introspection" = "xyes"; then - INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` - INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` - INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` - INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` - INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" - INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` - INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` - INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection - fi - AC_SUBST(INTROSPECTION_SCANNER) - AC_SUBST(INTROSPECTION_COMPILER) - AC_SUBST(INTROSPECTION_GENERATE) - AC_SUBST(INTROSPECTION_GIRDIR) - AC_SUBST(INTROSPECTION_TYPELIBDIR) - AC_SUBST(INTROSPECTION_CFLAGS) - AC_SUBST(INTROSPECTION_LIBS) - AC_SUBST(INTROSPECTION_MAKEFILE) - - AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes") -]) - - -dnl Usage: -dnl GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version]) - -AC_DEFUN([GOBJECT_INTROSPECTION_CHECK], -[ - _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1]) -]) - -dnl Usage: -dnl GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version]) - - -AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE], -[ - _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require]) -]) diff --git a/tests/Makefile.am b/tests/Makefile.am index 5f7e5b2..709bd84 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -23,14 +23,8 @@ C_TESTS = \ cairo-RGB24 \ $(CONCURRENCY_STRESS_TEST) -if HAVE_INTROSPECTION -INTROSPECTION_TESTS = \ - introspection.py -endif - TESTS = \ - $(C_TESTS) \ - $(INTROSPECTION_TESTS) + $(C_TESTS) TESTS_ENVIRONMENT = LD_LIBRARY_PATH=$(top_builddir)/babl:$LD_LIBRARY_PATH GI_TYPELIB_PATH=$(top_builddir)/babl BABL_PATH=$(top_builddir)/extensions/.libs @@ -44,9 +38,6 @@ LDADD = $(top_builddir)/babl/libbabl-@BABL_API_VERSION@.la \ EXTRA_DIST=common.inc -dist_noinst_SCRIPTS = \ - introspection.py - noinst_PROGRAMS = \ introspect \ babl_fish_path_fitness \ diff --git a/tests/introspection.py b/tests/introspection.py deleted file mode 100755 index 1e855aa..0000000 --- a/tests/introspection.py +++ /dev/null @@ -1,18 +0,0 @@ -#!/usr/bin/env python - -import unittest - -class TestSanity(unittest.TestCase): - - def test_import(self): - import gi - from gi.repository import Babl - - def test_init(self): - import gi - from gi.repository import Babl - Babl.init() - Babl.exit() - -if __name__ == '__main__': - unittest.main() -- 2.30.2